Add buildable vtk9
authorAnton Gladky <gladk@debian.org>
Tue, 27 Oct 2020 21:38:20 +0000 (22:38 +0100)
committerAnton Gladky <gladk@debian.org>
Tue, 27 Oct 2020 21:38:20 +0000 (22:38 +0100)
39 files changed:
debian/changelog
debian/control
debian/libvtk8-dev.install [deleted file]
debian/libvtk8-dev.lintian-overrides [deleted file]
debian/libvtk8-java.install [deleted file]
debian/libvtk8-java.lintian-overrides [deleted file]
debian/libvtk8-jni.install [deleted file]
debian/libvtk8-jni.lintian-overrides [deleted file]
debian/libvtk8-qt-dev.install [deleted file]
debian/libvtk8-qt-dev.lintian-overrides [deleted file]
debian/libvtk8-qt.install [deleted file]
debian/libvtk8-qt.lintian-overrides [deleted file]
debian/libvtk8.install [deleted file]
debian/libvtk8.lintian-overrides [deleted file]
debian/libvtk9-dev.install [new file with mode: 0644]
debian/libvtk9-java.install [new file with mode: 0644]
debian/libvtk9-jni.install [new file with mode: 0644]
debian/libvtk9.install [new file with mode: 0644]
debian/patches/110_do_not_link_against_socket.patch
debian/patches/30_matplotlib.patch
debian/patches/drop_medical_example.patch [new file with mode: 0644]
debian/patches/libharu_version.patch [new file with mode: 0644]
debian/patches/series
debian/python3-vtk8.install [deleted file]
debian/python3-vtk8.lintian-overrides [deleted file]
debian/python3-vtk9.install [new file with mode: 0644]
debian/rules
debian/tcl-vtk8.install [deleted file]
debian/tcl-vtk8.lintian-overrides [deleted file]
debian/tests/control
debian/vtk8-doc.docs [deleted file]
debian/vtk8-doc.links [deleted file]
debian/vtk8-examples.examples [deleted file]
debian/vtk8.install [deleted file]
debian/vtk8.lintian-overrides [deleted file]
debian/vtk9-doc.docs [new file with mode: 0644]
debian/vtk9-doc.links [new file with mode: 0644]
debian/vtk9-examples.examples [new file with mode: 0644]
debian/vtk9.install [new file with mode: 0644]

index a2fd08ba267ee0efcaf52ac6c5a560d61ebdcd94..bccf3945b10ceea7b0ed9d82e8743ce05f80fa1e 100644 (file)
@@ -1,4 +1,4 @@
-vtk8 (8.2.0+dfsg1-1) UNRELEASED; urgency=medium
+vtk9 (9.0.1+dfsg1-1) UNRELEASED; urgency=medium
 
   [ Gert Wollny ]
   * Initial release. (Closes: #XXXXXX)
index fcca93ea8a8dacc09371ae680ff9af81c06d780b..a2fad4b1278b5a37d2dbb295c1a2c53681ab1e7b 100644 (file)
@@ -1,4 +1,4 @@
-Source: vtk8
+Source: vtk9
 Maintainer: Debian Science Team <debian-science-maintainers@lists.alioth.debian.org>
 Uploaders: Anton Gladky <gladk@debian.org>,
            Gert Wollny <gewo@debian.org>,
@@ -26,6 +26,8 @@ Build-Depends: chrpath,
                libfreetype6-dev,
                libfontconfig1-dev,
                libgdal-dev,
+               libhpdf-dev,
+               libogg-dev,
                libgl1-mesa-dev | libgl-dev,
                libgl2ps-dev (>= 1.4.0),
                libglew-dev,
@@ -40,9 +42,6 @@ Build-Depends: chrpath,
                libpng-dev,
                libpq-dev,
                libproj-dev,
-               libqt5opengl5-dev,
-               libqt5webkit5-dev,
-               libqt5x11extras5-dev,
                libsqlite3-dev,
                libswscale-dev,
                libtheora-dev,
@@ -60,8 +59,6 @@ Build-Depends: chrpath,
                python3-all-dev,
                python3-matplotlib,
                python3-mpi4py,
-               qtbase5-dev,
-               qttools5-private-dev,
                r-base,
                r-base-core,
                r-base-dev,
@@ -79,11 +76,11 @@ Build-Depends-Indep: doxygen-latex,
                      gnuplot-nox
 Standards-Version: 4.4.1
 Rules-Requires-Root: no
-Vcs-Browser: https://salsa.debian.org/science-team/vtk8
-Vcs-Git: https://salsa.debian.org/science-team/vtk8.git
+Vcs-Browser: https://salsa.debian.org/science-team/vtk9
+Vcs-Git: https://salsa.debian.org/science-team/vtk9.git
 Homepage: https://www.vtk.org/
 
-Package: libvtk8-dev
+Package: libvtk9-dev
 Architecture: any
 Section: libdevel
 Depends: default-libmysqlclient-dev,
@@ -110,25 +107,24 @@ Depends: default-libmysqlclient-dev,
          libswscale-dev,
          libtheora-dev,
          libtiff-dev,
-         libvtk8 (= ${binary:Version}),
-         libvtk8-java (= ${binary:Version}),
+         libvtk9 (= ${binary:Version}),
+         libvtk9-java (= ${binary:Version}),
          libx11-dev,
          libxft-dev,
          libxml2-dev,
          libxss-dev,
          libxt-dev,
          mpi-default-dev,
-         python3-vtk8 (= ${binary:Version}),
+         python3-vtk9 (= ${binary:Version}),
          tcl-dev,
-         tcl-vtk8 (= ${binary:Version}),
          tk-dev,
-         vtk8 (= ${binary:Version}),
+         vtk9 (= ${binary:Version}),
          x11proto-core-dev,
          zlib1g-dev,
          ${misc:Depends},
          ${shlibs:Depends}
-Suggests: vtk8-doc,
-          vtk8-examples
+Suggests: vtk9-doc,
+          vtk9-examples
 Conflicts: libvtk5-dev,
            libvtk6-dev,
            libvtk7-dev
@@ -142,32 +138,14 @@ Description: VTK header files
  This package provides the VTK header files required to compile
  C++ programs that use VTK to do 3D visualisation.
 
-Package: libvtk8-qt-dev
-Architecture: any
-Section: libdevel
-Depends: libvtk8-dev (= ${binary:Version}),
-         libvtk8-qt (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends},
-         qtbase5-dev,
-         qttools5-private-dev,
-         libqt5opengl5-dev,
-         libqt5webkit5-dev
-Description: VTK header files, containing Qt files
- The Visualization Toolkit (VTK) is an open-source software system
- for 3D computer graphics, image processing, and visualization.
- .
- This package provides the VTK header files required to compile
- C++ programs that use VTK to do 3D visualisation. Qt files
-
-Package: libvtk8
+Package: libvtk9
 Architecture: any
 Section: libs
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Suggests: mpi-default-bin,
-          vtk8-doc,
-          vtk8-examples
+          vtk9-doc,
+          vtk9-examples
 Replaces: libvtk5.8,
           libvtk7.1
 Description: VTK libraries
@@ -177,46 +155,17 @@ Description: VTK libraries
  This package provides the shared libraries needed to run C++ programs
  that use VTK.
 
-Package: libvtk8-qt
-Architecture: any
-Section: libs
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
-Description: VTK libraries, Qt files
- The Visualization Toolkit (VTK) is an open-source software system
- for 3D computer graphics, image processing, and visualization.
- .
- This package provides the shared libraries needed to run C++ programs
- that use VTK. Qt files
-
-Package: libvtk8-jni
+Package: libvtk9-java
 Architecture: any
 Section: java
-Depends: ${java:Depends},
-         ${misc:Depends},
-         ${shlibs:Depends}
-Breaks: libvtk6-jni,
-        libvtk7-jni
-Replaces: libvtk6-jni,
-          libvtk7-jni
-Description: VTK - Java Native Interface (JNI) files
- The Visualization Toolkit (VTK) is an object oriented, high level
- library that allows one to easily write C++ programs, Tcl, Python and
- Java scripts that do 3D visualization.
- .
- This package provides the Java Native Interface files.
-
-Package: libvtk8-java
-Architecture: any
-Section: java
-Depends: libvtk8-jni (= ${binary:Version}),
+Depends: libvtk9-jni (= ${binary:Version}),
          ${java:Depends},
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: java-virtual-machine,
-          libvtk8-dev (= ${binary:Version}),
-          vtk8-doc,
-          vtk8-examples
+          libvtk9-dev (= ${binary:Version}),
+          vtk9-doc,
+          vtk9-examples
 Replaces: libvtk6-java,
           libvtk7-java
 Breaks: libvtk6-java,
@@ -228,18 +177,17 @@ Description: VTK - Java language support
  .
  This package provides the VTK Java language support.
 
-Package: python3-vtk8
+Package: python3-vtk9
 Architecture: any
 Section: python
-Depends: libvtk8 (= ${binary:Version}),
-         libvtk8-qt (= ${binary:Version}),
+Depends: libvtk9 (= ${binary:Version}),
          python3-mpi4py,
          ${misc:Depends},
          ${python3:Depends},
          ${shlibs:Depends}
 Suggests: mayavi2,
-          vtk8-doc,
-          vtk8-examples
+          vtk9-doc,
+          vtk9-examples
 Breaks: python3-vtk6,
         python3-vtk7
 Replaces: python3-vtk6,
@@ -250,62 +198,44 @@ Description: Python bindings for VTK
  .
  This package provides the python3 bindings for VTK.
 
-Package: tcl-vtk8
-Architecture: any
-Section: interpreters
-Depends: libvtk8 (= ${binary:Version}),
-         libvtk8-qt (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Suggests: vtk8-doc,
-          vtk8-examples
-Description: Tcl bindings for VTK
- The Visualization Toolkit (VTK) is an open-source software system
- for 3D computer graphics, image processing, and visualization.
- .
- This package provides the shared libraries and executable that enable
- one to use VTK from Tcl/Tk scripts.
-
-Package: vtk8
+Package: vtk9
 Architecture: any
 Section: interpreters
-Depends: libvtk8 (= ${binary:Version}),
+Depends: libvtk9 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Suggests: vtk8-doc,
-          vtk8-examples
-Description: Binaries for VTK8
+Suggests: vtk9-doc,
+          vtk9-examples
+Description: Binaries for VTK9
  The Visualization Toolkit (VTK) is an open-source software system
  for 3D computer graphics, image processing, and visualization.
  .
- This package provides binaries for VTK8
+ This package provides binaries for VTK9
 
-Package: vtk8-doc
+Package: vtk9-doc
 Architecture: all
 Section: doc
 Depends: doc-base,
          libjs-jquery,
         libjs-mathjax,
          ${misc:Depends}
-Suggests: libvtk8-dev,
-          vtk8-examples
+Suggests: libvtk9-dev,
+          vtk9-examples
 Description: VTK class reference documentation
  The Visualization Toolkit (VTK) is an open-source software system
  for 3D computer graphics, image processing, and visualization.
  .
- This package provides documentation for VTK8
+ This package provides documentation for VTK9
 
-Package: vtk8-examples
+Package: vtk9-examples
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: libvtk8-dev,
+Suggests: libvtk9-dev,
           python3,
-          python3-vtk8,
-          tcl-vtk8,
-          tclsh,
-          vtk8-doc
+          python3-vtk9,
+          vtk9-doc
 Description: VTK examples
  The Visualization Toolkit (VTK) is an open-source software system
  for 3D computer graphics, image processing, and visualization.
  .
- This package provides examples for VTK8
+ This package provides examples for VTK9
diff --git a/debian/libvtk8-dev.install b/debian/libvtk8-dev.install
deleted file mode 100644 (file)
index 2232adc..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# add doxygen docs
-# to get paraview debian/build properly on top of vtk we now add this as a symlink
-# in the python3-vtk8 package
-# /usr/lib/*/python3.6/site-packages/vtk/*
-CMake/TopologicalSort.cmake usr/lib/cmake/vtk-8.2/
-CMake/vtkGroups.cmake usr/lib/cmake/vtk-8.2/
-CMake/vtkTesting*.cmake        usr/lib/cmake/vtk-8.2/
-Common/DataModel/vtkMarchingCubesTriangleCases.h usr/include/vtk-8.2/
-Filters/Statistics/vtkStatisticsAlgorithmPrivate.h usr/include/vtk-8.2/
-IO/Import/vtk3DS.h usr/include/vtk-8.2/
-Testing/Core/vtkTestDriver.h usr/include/vtk-8.2
-Testing/Core/vtkTestUtilities.h usr/include/vtk-8.2/
-Testing/Core/vtkTesting*.h usr/include/vtk-8.2/
-Testing/Rendering/vtkRegressionTestImage.h usr/include/vtk-8.2/
-Testing/Rendering/vtkTesting*.h usr/include/vtk-8.2
-Wrapping/Java/JavaDependencies.cmake.in usr/lib/cmake/vtk-8.2/
-# debian/build/lib/cmake/vtk-8.2/Modules/*-Headers.cmake       usr/lib/cmake/vtk-8.2/Modules/
-usr/include/vtk-8.2 usr/include
-usr/lib/*/*.so
-usr/lib/*/cmake/vtk-8.2
-usr/share/doc/vtk-8.2/doxygen/* /usr/share/vtk-8.2/doxygen/
diff --git a/debian/libvtk8-dev.lintian-overrides b/debian/libvtk8-dev.lintian-overrides
deleted file mode 100644 (file)
index f3c70f0..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-libvtk8-dev: shlib-without-versioned-soname
-libvtk8-dev: package-name-doesnt-match-sonames
-libvtk8-dev: postinst-must-call-ldconfig
-libvtk8-dev: hardening-no-relro
diff --git a/debian/libvtk8-java.install b/debian/libvtk8-java.install
deleted file mode 100644 (file)
index 20338ec..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin/vtkParseJava-8.2                    usr/bin
-usr/bin/vtkWrapJava-8.2                     usr/bin
-usr/lib/*/vtk8.jar                          usr/share/java
diff --git a/debian/libvtk8-java.lintian-overrides b/debian/libvtk8-java.lintian-overrides
deleted file mode 100644 (file)
index 4cc65e8..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# Upstream does not provide manpages
-libvtk8-java: binary-without-manpage
-libvtk8-java: hardening-no-relro
diff --git a/debian/libvtk8-jni.install b/debian/libvtk8-jni.install
deleted file mode 100644 (file)
index 9476596..0000000
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/jni/
diff --git a/debian/libvtk8-jni.lintian-overrides b/debian/libvtk8-jni.lintian-overrides
deleted file mode 100644 (file)
index 9ef03e6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-libvtk8-jni: hardening-no-relro
diff --git a/debian/libvtk8-qt-dev.install b/debian/libvtk8-qt-dev.install
deleted file mode 100644 (file)
index c92ab8c..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-# remove Python files here and privide a symlink in the python package
-# usr/lib/*/python3.6/site-packages/vtk/*Qt*
-usr/lib/*/*Qt*.so
-# usr/lib/cmake/vtk-8.2/Modules/*Qt*
-usr/include/vtk-8.2/*Qt*
-usr/include/vtk-8.2/Q*
diff --git a/debian/libvtk8-qt-dev.lintian-overrides b/debian/libvtk8-qt-dev.lintian-overrides
deleted file mode 100644 (file)
index 6c882d9..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-libvtk8-qt-dev: shlib-without-versioned-soname
-libvtk8-qt-dev: package-name-doesnt-match-sonames
-libvtk8-qt-dev: hardening-no-relro
-
diff --git a/debian/libvtk8-qt.install b/debian/libvtk8-qt.install
deleted file mode 100644 (file)
index 4c7a2dd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/*Qt*.so.*
diff --git a/debian/libvtk8-qt.lintian-overrides b/debian/libvtk8-qt.lintian-overrides
deleted file mode 100644 (file)
index 16ad67b..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-libvtk8-qt: hardening-no-relro
-libvtk8-qt: package-name-doesnt-match-sonames
-
diff --git a/debian/libvtk8.install b/debian/libvtk8.install
deleted file mode 100644 (file)
index 3de3b10..0000000
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/*.so.*
diff --git a/debian/libvtk8.lintian-overrides b/debian/libvtk8.lintian-overrides
deleted file mode 100644 (file)
index ce3c424..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-libvtk8: package-name-doesnt-match-sonames
-libvtk8: hardening-no-relro
-# Will be discussed with upstream to have an opportunity to set USE_SYSTEM_lib
-
-libvtk8: embedded-library
diff --git a/debian/libvtk9-dev.install b/debian/libvtk9-dev.install
new file mode 100644 (file)
index 0000000..cf1d623
--- /dev/null
@@ -0,0 +1,4 @@
+usr/include/vtk-9.0 usr/include
+usr/lib/*/*.so
+usr/lib/*/cmake/vtk-9.0
+usr/share/doc/vtk-9.0/doxygen/* /usr/share/vtk-9.0/doxygen/
diff --git a/debian/libvtk9-java.install b/debian/libvtk9-java.install
new file mode 100644 (file)
index 0000000..015479e
--- /dev/null
@@ -0,0 +1,4 @@
+usr/bin/vtkParseJava-9.0                    usr/bin
+usr/bin/vtkWrapJava-9.0                     usr/bin
+usr/lib/*/java/vtk9.jar                     usr/share/java
+usr/lib/*/java/vtk-L*
diff --git a/debian/libvtk9-jni.install b/debian/libvtk9-jni.install
new file mode 100644 (file)
index 0000000..9476596
--- /dev/null
@@ -0,0 +1 @@
+usr/lib/*/jni/
diff --git a/debian/libvtk9.install b/debian/libvtk9.install
new file mode 100644 (file)
index 0000000..3de3b10
--- /dev/null
@@ -0,0 +1 @@
+usr/lib/*/*.so.*
index 575840f37a98320de08d62f376b1b2c3b6c2f8fb..8b4e89f981b055b9db664b2f36449785a0377ca2 100644 (file)
@@ -1,8 +1,10 @@
 Description: Do not try linking with -lsocket
 
---- a/Common/System/vtkTestSocketFeatures.cmake
-+++ b/Common/System/vtkTestSocketFeatures.cmake
-@@ -6,9 +6,6 @@
+Index: VTK-9.0.1/Common/System/vtkTestSocketFeatures.cmake
+===================================================================
+--- VTK-9.0.1.orig/Common/System/vtkTestSocketFeatures.cmake
++++ VTK-9.0.1/Common/System/vtkTestSocketFeatures.cmake
+@@ -6,9 +6,6 @@ check_library_exists("socket" getsocknam
  
  if(NOT DEFINED VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T)
    set(VTK_GETSOCKNAME_LIBS)
@@ -11,4 +13,4 @@ Description: Do not try linking with -lsocket
 -  endif()
    message(STATUS "Checking for getsockname with socklen_t")
    try_compile(VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T_COMPILED
-     ${VTK_BINARY_DIR}/CMakeTmp/SocklenT
+     ${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp/SocklenT
index 6888f1c73b37a2cd2d944d1d5328e464f0da9f88..a7a44b25fb89521e72d50c50b933ea1a4988bd1b 100644 (file)
@@ -1,6 +1,8 @@
---- a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
-+++ b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
-@@ -156,6 +156,10 @@
+Index: VTK-9.0.1/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
+===================================================================
+--- VTK-9.0.1.orig/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
++++ VTK-9.0.1/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
+@@ -151,6 +151,10 @@ private:
     * to implement IsAvailable.
     */
    static Availability CheckMPLAvailability();
diff --git a/debian/patches/drop_medical_example.patch b/debian/patches/drop_medical_example.patch
new file mode 100644 (file)
index 0000000..f3a5432
--- /dev/null
@@ -0,0 +1,58 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ vtk9 (9.0.1+dfsg1-1) UNRELEASED; urgency=medium
+ .
+   [ Gert Wollny ]
+   * Initial release. (Closes: #XXXXXX)
+ .
+   [ Drew Parsons ]
+   * Thanks: Nico Schloemer, Johannes Schauer and Gert for initial work
+     and python3 packaging.
+   * Drop deprecated patches:
+      10_allpatches.patch
+      40_use_system_sqlite.patch
+       - VTK_USE_SYSTEM_SQLITE now available
+      60_use_system_mpi4py.patch
+       - handled by VTK_USE_SYSTEM_MPI4PY
+      80_fix_arm_compilation.patch
+       - Qt5 now builds on arm
+      107_gl2ps_1.4.0.patch
+      109_use_parallel_hdf5.patch
+      111_search_multiarch_paths_for_libproj.patch
+ .
+   [ Nico Schlömer ]
+   * Update to 8.2.0
+   * remove obsolete patches, configure options
+   * rework utf-8 patch
+   * Update standard to 4.4.1 (no changes)
+Author: Johannes Schauer <josch@debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2020-10-21
+
+--- vtk9-9.0.1+dfsg1.orig/Examples/CMakeLists.txt
++++ vtk9-9.0.1+dfsg1/Examples/CMakeLists.txt
+@@ -55,7 +55,7 @@ else ()
+   add_example(IO/Cxx)
+   add_example(ImageProcessing/Cxx)
+   add_example(Infovis/Cxx)
+-  add_example(Medical/Cxx)
++  #add_example(Medical/Cxx)
+   add_example(Modelling/Cxx)
+   add_example(MultiBlock/Cxx)
+   add_example(ParallelProcessing/Generic/Cxx)
diff --git a/debian/patches/libharu_version.patch b/debian/patches/libharu_version.patch
new file mode 100644 (file)
index 0000000..58104fb
--- /dev/null
@@ -0,0 +1,68 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ vtk9 (9.0.1+dfsg1-1) UNRELEASED; urgency=medium
+ .
+   [ Gert Wollny ]
+   * Initial release. (Closes: #XXXXXX)
+ .
+   [ Drew Parsons ]
+   * Thanks: Nico Schloemer, Johannes Schauer and Gert for initial work
+     and python3 packaging.
+   * Drop deprecated patches:
+      10_allpatches.patch
+      40_use_system_sqlite.patch
+       - VTK_USE_SYSTEM_SQLITE now available
+      60_use_system_mpi4py.patch
+       - handled by VTK_USE_SYSTEM_MPI4PY
+      80_fix_arm_compilation.patch
+       - Qt5 now builds on arm
+      107_gl2ps_1.4.0.patch
+      109_use_parallel_hdf5.patch
+      111_search_multiarch_paths_for_libproj.patch
+ .
+   [ Nico Schlömer ]
+   * Update to 8.2.0
+   * remove obsolete patches, configure options
+   * rework utf-8 patch
+   * Update standard to 4.4.1 (no changes)
+Author: Johannes Schauer <josch@debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2020-10-22
+
+Index: VTK-9.0.1/ThirdParty/libharu/CMakeLists.txt
+===================================================================
+--- VTK-9.0.1.orig/ThirdParty/libharu/CMakeLists.txt
++++ VTK-9.0.1/ThirdParty/libharu/CMakeLists.txt
+@@ -1,14 +1,14 @@
+ vtk_module_third_party(
+   INTERNAL
+     LICENSE_FILES "vtklibharu/LICENCE"
+-    VERSION       "2.4.0"
++    VERSION       "2.3.0"
+     STANDARD_INCLUDE_DIRS
+   EXTERNAL
+     PACKAGE LibHaru
+     # Unreleased. Requires these PRs:
+     # https://github.com/libharu/libharu/pull/157
+     # https://github.com/libharu/libharu/pull/187
+-    VERSION 2.4.0
++    VERSION 2.3.0
+     TARGETS LibHaru::LibHaru
+     STANDARD_INCLUDE_DIRS)
index f346ea3c75ca747ca406e9742d1438c9d415cab1..8909769632017da2dfa1db2f4e2ec4df712ac269 100644 (file)
@@ -1,11 +1,12 @@
-20_soversion-sharedlib.patch
+#20_soversion-sharedlib.patch
 30_matplotlib.patch
-50_use_system_utf8.patch
-60_remove_mpi4py_dependency.patch
-70_fix_ftbfs_gcc49.patch
-100_javac-heap.patch
-101_java_install_path.patch
-105_unforce_embedded_glew.patch
-106_install_doxygen_scripts_in_nodoc_build.patch
-108_Doxygen-use-mathjax.patch
+#50_use_system_utf8.patch
+#60_remove_mpi4py_dependency.patch
+#70_fix_ftbfs_gcc49.patch
+#100_javac-heap.patch
+#101_java_install_path.patch
+#105_unforce_embedded_glew.patch
+#106_install_doxygen_scripts_in_nodoc_build.patch
+#108_Doxygen-use-mathjax.patch
 110_do_not_link_against_socket.patch
+drop_medical_example.patch
diff --git a/debian/python3-vtk8.install b/debian/python3-vtk8.install
deleted file mode 100644 (file)
index 2f0cca1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/python3*/site-packages/* /usr/lib/python3/dist-packages/
diff --git a/debian/python3-vtk8.lintian-overrides b/debian/python3-vtk8.lintian-overrides
deleted file mode 100644 (file)
index f7f17ea..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-# Upstream does not provide manpages
-python3-vtk8: binary-without-manpage
-python3-vtk8: binary-or-shlib-defines-rpath
-python3-vtk8: hardening-no-relro
diff --git a/debian/python3-vtk9.install b/debian/python3-vtk9.install
new file mode 100644 (file)
index 0000000..2f0cca1
--- /dev/null
@@ -0,0 +1 @@
+usr/lib/*/python3*/site-packages/* /usr/lib/python3/dist-packages/
index bda311711e5107ff40adaf38dacf2cf700345582..e949fb4f3ac662b8a75d1b55811646850d1c4b6b 100755 (executable)
@@ -10,7 +10,6 @@ else
   BUILDDOC = ON
 endif
 
-# export JAVA_HOME to help FindJava.cmake and FindJNI.cmake
 export JAVA_HOME=/usr/lib/jvm/default-java
 
 %:
@@ -21,52 +20,39 @@ extra_flags +=  \
        -DCMAKE_VERBOSE_MAKEFILE=ON \
        -DCMAKE_C_COMPILER=mpicc \
        -DCMAKE_CXX_COMPILER=mpic++ \
-       -DBUILD_DOCUMENTATION=$(BUILDDOC) \
-       -DBUILD_EXAMPLES=ON \
+       -DVTK_BUILD_DOCUMENTATION=$(BUILDDOC) \
+       -DVTK_BUILD_EXAMPLES=OFF \
        -DBUILD_SHARED_LIBS=ON \
-       -DBUILD_TESTING=OFF \
+       -DVTK_BUILD_TESTING=OFF \
        -DVTK_USE_TK=ON \
-       \
        -DVTK_WRAP_JAVA=ON \
        -DVTK_WRAP_PYTHON=ON \
-         -DVTK_PYTHON_VERSION:STRING=3 \
-       \
-       -DVTK_USE_SYSTEM_DOUBLECONVERSION=ON \
-       -DVTK_USE_SYSTEM_EIGEN=ON \
-       -DVTK_USE_SYSTEM_EXPAT=ON \
-       -DVTK_USE_SYSTEM_FREETYPE=ON \
-       -DVTK_USE_SYSTEM_GL2PS=ON \
-       -DVTK_USE_SYSTEM_GLEW=ON \
-       -DVTK_USE_SYSTEM_HDF5=ON \
-         -DHDF5_PREFER_PARALLEL=ON \
-       -DVTK_USE_SYSTEM_JPEG=ON \
-       -DVTK_USE_SYSTEM_JSONCPP=ON \
-       -DVTK_USE_SYSTEM_LIBPROJ=ON \
-       -DVTK_USE_SYSTEM_LIBXML2=ON \
-       -DVTK_USE_SYSTEM_LZ4=ON \
-       -DVTK_USE_SYSTEM_LZMA=ON \
-       -DVTK_USE_SYSTEM_MPI4PY=ON \
-       -DVTK_USE_SYSTEM_NETCDF=ON \
-       -DVTK_USE_SYSTEM_PNG=ON \
-       -DVTK_USE_SYSTEM_SQLITE=ON \
-       -DVTK_USE_SYSTEM_TIFF=ON \
-       -DVTK_USE_SYSTEM_XDMF3=ON \
-       -DVTK_USE_SYSTEM_ZLIB=ON \
-       \
+       -DHDF5_IS_PARALLEL=OFF \
+       -DVTK_MODULE_USE_EXTERNAL_VTK_eigen:BOOL=ON \
+       -DVTK_MODULE_USE_EXTERNAL_VTK_expat:BOOL=ON \
+       -DVTK_MODULE_USE_EXTERNAL_VTK_freetype:BOOL=ON \
+       -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=ON \
+       -DVTK_MODULE_USE_EXTERNAL_VTK_glew:BOOL=ON \
+       -DVTK_MODULE_USE_EXTERNAL_VTK_hdf5:BOOL=ON \
+       -DVTK_MODULE_USE_EXTERNAL_VTK_jpeg:BOOL=ON \
+       -DVTK_MODULE_USE_EXTERNAL_VTK_jsoncpp:BOOL=ON \
+       -DVTK_MODULE_USE_EXTERNAL_VTK_libproj:BOOL=ON \
+       -DVTK_MODULE_USE_EXTERNAL_VTK_libxml2:BOOL=ON \
+       -DVTK_MODULE_USE_EXTERNAL_VTK_lz4:BOOL=ON \
+       -DVTK_MODULE_USE_EXTERNAL_VTK_lzma:BOOL:BOOL=ON \
+       -DVTK_MODULE_USE_EXTERNAL_VTK_netcdf:BOOL=ON \
+       -DVTK_MODULE_USE_EXTERNAL_VTK_ogg:BOOL=ON \
+       -DVTK_MODULE_USE_EXTERNAL_VTK_png:BOOL=ON \
+       -DVTK_MODULE_USE_EXTERNAL_VTK_sqlite:BOOL=ON \
+       -DVTK_MODULE_USE_EXTERNAL_VTK_theora:BOOL=ON \
+       -DVTK_MODULE_USE_EXTERNAL_VTK_tiff:BOOL=ON \
+       -DVTK_MODULE_USE_EXTERNAL_VTK_zlib:BOOL=ON \
+       -DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion:BOOL=ON \
+       -DVTK_PYTHON_VERSION:STRING=3 \
        -DVTK_EXTRA_COMPILER_WARNINGS=ON \
-       -DVTK_Group_Imaging=ON \
-       -DVTK_Group_MPI=ON \
-       -DVTK_Group_Tk=ON \
-       -DVTK_Group_Views=ON \
-       -DMPI_CXX_INCLUDE_PATH="/usr/include/mpi" \
-       -DVTK_INSTALL_LIBRARY_DIR="/usr/lib/$(DEB_HOST_MULTIARCH)" \
        -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed" \
        -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed" \
-       -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" \
-       -DModule_vtkRenderingExternal=ON \
-       -DModule_vtkAcceleratorsVTKm=OFF
-
-extra_flags += -DVTK_QT_VERSION=5      -DVTK_Group_Qt=ON
+       -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed"
 
 override_dh_auto_configure:
 ifneq (,$(filter $(DEB_HOST_ARCH),$(noqt_archs)))
@@ -97,23 +83,14 @@ override_dh_auto_install:
        # Modify vtkWrapJava.cmake to properly upload JavaDependencies.cmake.in from $VTK_DIR
        perl -pi -e "s|{dir}/JavaDependencies.cmake.in\"|{VTK_DIR}/JavaDependencies.cmake.in\"|" debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/vtk-8.2/vtkWrapJava.cmake
        # Correct headers for paraview
-       mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/vtk.jar $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/vtk8.jar
-       mv $(CURDIR)/debian/build/bin/vtkpython $(CURDIR)/debian/build/bin/vtk8python
-       sed -i -e "s/FATAL_ERROR/STATUS/g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/vtk-8.2/VTKTargets.cmake
-       chrpath -d $(CURDIR)/debian/build/bin/vtk8python
-       # chrpath -d $(CURDIR)/debian/build/bin/pvtk
-       chrpath -d $(CURDIR)/debian/build/bin/pvtkpython
-       # mv $(CURDIR)/debian/tmp/usr/bin/vtk $(CURDIR)/debian/tmp/usr/bin/vtk8
+       mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk.jar $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk9.jar
+       mv $(CURDIR)/debian/build/bin/vtkpython $(CURDIR)/debian/build/bin/vtk9python
+       sed -i -e "s/FATAL_ERROR/STATUS/g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/vtk-9.0/VTK-targets.cmake
+       chrpath -d $(CURDIR)/debian/build/bin/vtk9python
+
        find $(CURDIR)/debian/tmp/ -name "*.pyc" | xargs rm -f
        find $(CURDIR)/debian/tmp/ -name "*.pyo" | xargs rm -f
 
 override_dh_install-arch:
        dh_install -a
-       find $(CURDIR)/debian/libvtk8-dev/ -name "*Qt*" -exec rm {} \;
-       find $(CURDIR)/debian/libvtk8/ -name "*Qt*" -exec rm {} \;
-       find $(CURDIR)/debian/libvtk8-dev/ -name "libvtkRenderingPythonTkWidgets.so" -exec rm {} \;
-       find $(CURDIR)/debian/libvtk8-dev/usr/include/ -name "Q*" -exec rm {} \;
-       # chmod 755 $(CURDIR)/debian/libvtk8-dev/usr/share/doc/vtk-8.2/doxygen/*.pl
-       # mkdir -p  $(CURDIR)/debian/python3-vtk8/usr/lib/$(DEB_HOST_MULTIARCH)/python3.7/site-packages/ && \
-       #   cd $(CURDIR)/debian/python3-vtk8/usr/lib/$(DEB_HOST_MULTIARCH)/python3.7/site-packages/ && \
-       #   ln -s /usr/lib/python3/dist-packages/vtk vtk
+       find $(CURDIR)/debian/libvtk9-dev/ -name "libvtkRenderingPythonTkWidgets.so" -exec rm {} \;
diff --git a/debian/tcl-vtk8.install b/debian/tcl-vtk8.install
deleted file mode 100644 (file)
index acfa337..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# usr/bin/vtkWrapTcl-8.2
-# usr/bin/vtkWrapTclInit-8.2
-# usr/lib/tcltk
diff --git a/debian/tcl-vtk8.lintian-overrides b/debian/tcl-vtk8.lintian-overrides
deleted file mode 100644 (file)
index 572112c..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# Upstream does not provide manpages
-tcl-vtk8: binary-without-manpage
-tcl-vtk8: hardening-no-relro
index bdca94cadeb0652ee9952a04168c30617d872a16..98d629557ea5368b1afa0b21db5fee5ff0c8d5c8 100644 (file)
@@ -1,3 +1,3 @@
 Tests: buildBoolean buildPoint buildVTU buildDistance buildPNG buildVTP
-Depends: libvtk8-dev, build-essential, cmake
+Depends: libvtk9-dev, build-essential, cmake
 Restrictions: allow-stderr
diff --git a/debian/vtk8-doc.docs b/debian/vtk8-doc.docs
deleted file mode 100644 (file)
index 7d47f2e..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/doc/vtk-8.2/doxygen
-debian/build/Utilities/Doxygen/doc/html
diff --git a/debian/vtk8-doc.links b/debian/vtk8-doc.links
deleted file mode 100644 (file)
index 36ad317..0000000
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/javascript/jquery/jquery.js usr/share/doc/vtk8-doc/html/jquery.js
diff --git a/debian/vtk8-examples.examples b/debian/vtk8-examples.examples
deleted file mode 100644 (file)
index a8d52f4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Examples/
diff --git a/debian/vtk8.install b/debian/vtk8.install
deleted file mode 100644 (file)
index d2cc2cb..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# usr/bin/vtk8
-# usr/bin/vtkEncodeString-8.2
-usr/bin/vtkWrapHierarchy-8.2
diff --git a/debian/vtk8.lintian-overrides b/debian/vtk8.lintian-overrides
deleted file mode 100644 (file)
index fa7987b..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# Upstream does not provide manpages
-vtk8: binary-without-manpage
-vtk8: hardening-no-relro
diff --git a/debian/vtk9-doc.docs b/debian/vtk9-doc.docs
new file mode 100644 (file)
index 0000000..dba89df
--- /dev/null
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/doc/vtk-9.0/doxygen
+debian/build/Utilities/Doxygen/doc/html
diff --git a/debian/vtk9-doc.links b/debian/vtk9-doc.links
new file mode 100644 (file)
index 0000000..f7b2e73
--- /dev/null
@@ -0,0 +1 @@
+usr/share/javascript/jquery/jquery.js usr/share/doc/vtk9-doc/html/jquery.js
diff --git a/debian/vtk9-examples.examples b/debian/vtk9-examples.examples
new file mode 100644 (file)
index 0000000..a8d52f4
--- /dev/null
@@ -0,0 +1 @@
+Examples/
diff --git a/debian/vtk9.install b/debian/vtk9.install
new file mode 100644 (file)
index 0000000..e2f93ce
--- /dev/null
@@ -0,0 +1 @@
+usr/bin/vtkWrapHierarchy-9.0